Code cleanup post to fdp command

[Shamanou]

Changed code, replace try catch blocks with if statements and put some redundant code in a generic method. I also implemented a specific push to fdp method to prevent redundancy.

[kburger]

Thanks for these changes. If you can look into the codacy report as a last thing (and probably skip the npath-complexity warning for now, unless you have a good grasp on how to solve it), then we can merge if afterwards.