"Port" parameter in URI is not working

[ikilled]

In plugin config dialog (checked in v2.3.0-SNAPSHOT):
If user uses amqp URI (instead entering connection params in separate fields) to specify connection parameters the Port parameter is not working.
Only if the user enters the port into the separate Port field (while still providing URI) the connection works fine.

2015/12/09 13:57:20 - Json output.0 - Finished processing (I=0, O=1, R=58, W=1, U=0, E=0)
2015/12/09 13:57:20 - AMQP producer.0 - ERROR (version 6.0.0.0-353, build 1 from 2015-10-07 13.27.43 by buildguy) : Unexpected error
2015/12/09 13:57:20 - AMQP producer.0 - ERROR (version 6.0.0.0-353, build 1 from 2015-10-07 13.27.43 by buildguy) : com.instaclick.pentaho.plugin.amqp.AMQPException
2015/12/09 13:57:20 - AMQP producer.0 -     at com.instaclick.pentaho.plugin.amqp.AMQPPlugin.processRow(AMQPPlugin.java:84)
2015/12/09 13:57:20 - AMQP producer.0 -     at org.pentaho.di.trans.step.RunThread.run(RunThread.java:62)
2015/12/09 13:57:20 - AMQP producer.0 -     at java.lang.Thread.run(Thread.java:745)
2015/12/09 13:57:20 - AMQP producer.0 - Caused by: java.lang.NullPointerException
2015/12/09 13:57:20 - AMQP producer.0 -     at com.instaclick.pentaho.plugin.amqp.AMQPPlugin.initPluginStep(AMQPPlugin.java:197)
2015/12/09 13:57:20 - AMQP producer.0 -     at com.instaclick.pentaho.plugin.amqp.AMQPPlugin.processRow(AMQPPlugin.java:82)
2015/12/09 13:57:20 - AMQP producer.0 -     ... 2 more
[...]
2015/12/09 14:03:33 - mapping - ERROR (version 6.0.0.0-353, build 1 from 2015-10-07 13.27.43 by buildguy) : Something went wrong while trying to stop the transformation: java.lang.NullPointerException