Specific catch block

According to Android developers (http://developer.android.com/reference/java/math/BigInteger.html#BigInteger(java.lang.String, int)), it can only throw NFE or NPE, but we have a null check, so only NFE can be thrown
Merge remote-tracking branch 'pa/jellybean' into fjpa